Updated code as per coding standards