Migrating serialisation to own module
Removing extraneous parens
Reordering Map witnesses for readability
Reordering Map witnesses for readability