Taking another stab at refactoring keys, types, formats, etc.