Refactoring, always refactoring...