Small row refactor