improve org usage
free up universal-argument for usage