Minor refactoring ok