Added command line arguments
Removed spurious imports