Added suggestions from the PR review