* Slight refactoring