Ammended changes according to comments left on pull request review.