Code Change as per coding standard