Did a little bit of refactoring yesterday, but not much
Reviewed r/151