making it all a bit more C++y. :)