refactor serializers