few refactorings and renamings