code cleanup for change password stuff