Updated pull request after code review