Hella Refactor