Code styling changes according to Code sniffer