removed unused imports
fixed imports; added javadoc