DF-5312 cleaned up Profiler code to follow code-style;
DF-5312 cleaned up Profiler code;