Full Clean up

Organize Imports, Correct Indentation, Whitespace.