Javadoc fixes
Code optimizations and cleanups per Sebb's comments