Tidy up comment location