more simplification of serializer