refactoring
refactoring + edit password