Some little formatting details

Make sure we always use 2.0 instead of 2.

Add spaces between operators and operands