style changes & remove unused imports
more style changes!