Rearranging some comments in the code