Given a disfluent sentence, modify the sentence to it to its equivalent fluent form, preserving the meaning of the sentence.

Has there ever been anyone charged with importing drugs from the U.S. or make that from Canada for personal medical use?
Has there ever been anyone charged with importing drugs from Canada for personal medicinal use?