Cleaning the Code, adding Args to the importer