Some refactoring, adding argparse and image cleanup (we are cloning after all)