Improves main command line executable