Slight refactoring for readability