Refactoring Commander

	modified:   main.py