started refactoring class