Applied codereview changes per pull request