Changes for Coding Style Guide