Refactor and remove 0s and 1s from price calculations