move misplaced comments