Misc changes for styleguide + DebugUtil singleton