Some refactoring

Some Refactoring, just wander, why the CustomTrack is always in here, did not change anything ...