Added /noclean command line argument
Improved input validation