Code and documentation cleanup for the serializers