User can be deleted + refactoring