Refactoring - simplifying class structure