Cleaning up API such that it's less juggling to send a response