Refactor... everything.