Refactoring, refactoring...