Fixed code style and removed unused imports