Further efficiency and line count reducing.