Fat refactor