Refactoring, playing with directives