Use C++11’s using instead of typedef
Change to the more friendly C++ using instead of typedef