refactoring & track list