Refactor for better readability