change the executable name to make command completion easier
cleanup formatting and unnecessary temporary variables