Reverting changes to files which do not do any important stuff.

Reintroducing comments, removing misplaced spaces and removing unused variables which have been introduced in you merge!