Cleaned up unneed white space changes and imports.