Cosmetics

Rearranged some comments