Edits for the Pull Request review