Removed unneeded imports
Finish the javadoc comments