s/virtual/override/ where applicable
Add "m_" prefix to member variables
Shuffle code around
Fix OS X