Adding/making changes to be more modern C++