Cleanup Javadocs and fix StackOverflowError