Some slight refactoring