"Refactor" this super important file