Profiling: Improving performance

Code organization & Has someone already ...