more cleanup & javadoc