What can we do to move this chunk of code out to a helper class?
This way we get a clear 'this is what was added' and 'this is what was removed' chunk. So that we can easily follow the logic here on github.