Refactor for easier reading