Small cleanups in Order to Cash