more cleanup

this should give also give us a speedup. there was never any need for
now and then to be floats