Quick refactor