Misc changes for styleguide + DebugUtil singleton
Merge remote-tracking branch 'upstream/master' into lb-refactor
Make corrections for styleguide conformance
Fix compile errors
Minor spacing fix
Fix uninitialized value crash

This change is obsolete, however.
Merge pull request #33 from LB--/styleguide-conformance

Styleguide conformance