Code cleanup, whitespace normalization and method categorization