Refactor Quantity column; continue #71