Restructure code without changing what it does. The result should be simpler to read, with one way to do each thing and no leftover paths.
