Revert "Move some of the maths to be double based to see the effects"

This reverts commit 75a3a690b1c06a8312166718476bf5a0867edd04.