Standardizing command line arguments, some import cleanup.