Reforming the Procedural Engine to be more C++11ey