Normalized changes to serializer in preparation for release