Code refactoring, one place!