Refactor for conciseness