Coding policy fixes and comment out debugging output.