Hella code cleanup