cleanup & more javadoc
renaming