Small bits of refactoring 3