Slight refactor to order manager