Refactor gabba