Clean up based on Sonar hotspots
* Improved unit testing coverage
* Removed unused imports
* Added some method documentation