refactor new user :recycle: