Simplify thanks to @jglick
Remove unnecessary javadocs
Grammar fix in javadocs
Tidy up other code paths