Cleanup and light Javadoc