Cleaned up finding a user by id