Removed unusual imports.
Did some javadoc-commenting.