Correct command line checking
Cleanup