Formatting of Comments

Changing comments so that they are inside the methods. This way they can
be collapsed.