Refactor for better expressiveness and conciseness.