Empty lines deleted + instance activeTracker method moved to private methods