Use Utils tracking helpers, optimized some imports.

- Also did minor cosmetic changes here and there.