Refactor/restore vials in stock count