Update and Delete User Implemeted, Small Refactoring