Implemented suggestions from comments on pull request