code cleanup and finish selected tracks for app