Refactoring, better control