Refactoring and cleaning with simplification of tracks settings