minor user refactorings