Clean up code
- remove unused imports
- format spacing and braces