Removing trailing spaces and reorder Trackable members class to avoid warning on gcc