Quick refactoring