reduce syntax clutter in a few places + update serializer/deserializer