findUserByEmail() + findUserById() = findUser()
Also made some changes for more clean code