Cleaned up solution and started to implement cancel order