added order status enum and cleanup code