Refactor the code in a fairly trivial way.