Move a comment to a better location