Add delete account feature + refactoring