Cleaning up some bad imports and unnecessary whitespace.