hella refactored