Bit of cleanup and C++14ification