Deleted unneeded exceptions
Removed unused imports
Added more JavaDocs