refactor shipping calculator compute methods

clearer naming for methods

Fixes #5414