Hella refactoring