Made requested changes to PR