GPII-784: Addressed the rest of antranigs comments on pull request