Some refactoring is good.