Improving efficiency while reducing code size

Time for a celebration beer