cleanup and added defaults to cli arguments