More cleanups and small refactor of OrderStatuses