Slight refactor for readability