Removed unused imports
Cleaned up the code

- Removed unused imports
* Optimized the code organization