Code cleaning
Code cleaning for user password change
Code cleaning for user password change