Unused imports; missing Override; updated javadoc