[Bug 1024857] reduce useless math
Merge resolved after incorporating review comments