Code style and import refactoring.