Code cleanup pt.1

- Removed unused imports
- Removed some duplicate code
- Fixed Method comments