Code changed according to Coding Guidelines