Cleaning whitespaces
Speedup loading on OSX

2.5 times startup time improvement