Move comment to its rightful place