removed some possible floating pint arithmetic