Updated code as per standards