cleaned up converters