Little user refactor