Changing the way to handle the requests. Making it more DRY.