Removed floating point from moving average calc