Cleanup and Javadocs