Improve calculation at checkout