Cleaned up code

Removed a lot of extra blank lines
Cleaned up imports