Refactor and made adding Reviewers easier, will clean up in a moment