Cleanup comments and whitespaces