Minor refactoring

For consitency