Additional comments and removed NULL in favor for nullptr