Very small negligible changes, add javadoc, test case, etc