Refactoring: better names for operators; columns -> select