Slight refactor for improved readability