Profiling

Improving performance: Code organization & Has someone already ...
Merge pull request #469 from lindbrook/patch-5

Profiling: Improving performance