Refactor. Refactor everywhere.