Code cleanup including whitespace adjustment, static imports, and removing unneeded type-safety annotations
More static imports, whitespace cleanup, etc.
Fixing indentation errors, etc.