Changed code to fix missing coding standard