Refactor for improved code readablility