Cleanup all code for consistency, and clarity.

I don't like the padding in the POJOs. Please remove all POJO padding if you want to get this merged.