Cleanup comments and whitespace