Organized imports
Organized imports and corrected warnings
General improvements

Improved javadocs and comments
Organized imports
Removed unused variables