Move comment to the right place