Style fixes. Removed unused imports.