Made some PR review related changes