Refactor hella shit