Cleaning up API formatting