Refactor for readability