cleanup: remove unused imports
cleanup: mostly white space and style changes