Feeling good about my refactoring ratio. :)

```
+9 -44
+8 -40
```