Minor refactoring
Further work