- did some C++ifying. let's try to follow suit :)