switched to nullptr instead of NULL or 0. Switch some expressions using ',' to multiple statements separated by ';' Removed unused template function Used override keyword for some overridden virtual functions.