Really really hope this was the last of the C++ style comments