danger user refactoring