Secondary Refactoring

Not all of the first one made it in...