Remaining low hanging fruit for efficiency improvements. Closes #237