Refactor all.