Moved getter/setter specifiers, renamed some methods, and tried to used nullptr everywhere 0 had been used previously (nullptr was added in C++11).