Cleanup all code for consistency, and clarity.

I'd like to keep the padding here to align the keys and values.