Removed unused imports
Added javadoc