Bit more clean up for #217