Clean up REST a little