* Minor refactoring