revision 4

class refactoring