added comments, refactoring
renamed class