Simple refactoring class added