Reorder m_enabled member on Trackable class to avoid warning when -Wreorder is turned on
Removing trailing spaces