Fixed formatting and imports

Removed unused imports and fixer formatting problems.