Change: Javadoc & Cleanup