Slight refactoring

Slight refactoring