Runtime Optimizations

Please review and pull the changes as requested in the issues 544 and 623.
At least I add an additional change to avoid useless the normalize function.

Thanks,
  Jürgen