Refactor things.