Cleanup Profiler a tad