a few tweaks for speed
Merge pull request #1 from mwieder/fix_formatting

Your contribution is greatly appreciated! :-)