Coding style, and unused imports