After refactoring, :only logic can be simplified