Small bits of refactoring 2