Coding Guidelines fixes
Coding Guidelines and minor fixes

Topic 1 & 2