trivil refactorings