Some refactoring

I decided I didn't like the server-side deciding how my data should be
formatted. I'm probably overthinking this, but why bother doing
something if I'm not going to do it right :)