cleanup and initial serializer work