Optimized imports and more style guide fixes.