added javadoc, removed unused imports