renamed class to be more appropriate, added doxygen comments