Refactor for ease of reading