Cleaned up Quantity ==