Added Volume based shipping calculator

And some small code cleanup

Why removing this?