Quick refactoring changes