Cleanup user serialization format a bit