Minor refactoring again