Some more little changes without huge effect.
Removed superfluous multiplication with 1