Making modifications per comments in the PR