Better comment placement