Fix number rounding, clarify comment and change var. names