Cleanup/javadoc-y stuff