refactoring row classes