More cleanup, updated Javadoc