Slight refactoring