WIP Javadoc and code clarifying