Improve convertor script