Updating accord to review, refactored code