Simplifying and removing duplication.