Added changes for LightmakerCanada coding style.