hella refactor