DF-5312 cleaned-up profiler code to follow code-style;
DF-5312 minor Profiler clean-up;