Consts changed to C++ style