polish up serializer