Added default command line paramater.
Clean up