Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Jonas Wanke <1a73af9e7ae00182733b2292511b814be66f065f@jonas-wanke.com>
candy-lang/candy,candy-lang/candy,candy-lang/candy