Cleaning up imports and some whitespace fixes