Further simplify calculation of k-factor

This reduces the parameters to their simplest form and should not regress.