Updated the serialization macros to print a bit prettier