Small fixes to comply with C++ best practices

Small fixes to comply with C++ best practices