Minor refactoring, work organization