renamed a class, added some javadoc