Rearranged comments and indentation