Cleaning whitespaces
Speedup loading on OSX

2.5 times startup time improvement
Merge pull request #23 from Luthaf/startup

Speedup loading on OSX