Code simplifying/unifying.