updated serializers. Style fixes