Further simplifying code.