General code cleanup. NO CODE/LOGIC CHANGES!

Massive import cleanup, removed unnecessary whitespaces, lines, etc.