Fix some remarks from code review
Fix some remarks from code review

nono/cozy-stack,sebn/cozy-stack,sebn/cozy-stack,sebn/cozy-stack,nono/cozy-stack,sebn/cozy-stack,nono/cozy-stack,nono/cozy-stack,nono/cozy-stack