Code Review PR

Not DRY.