Refactor for more readability