Refactor. Simplify.