Added command line options
Clean up