Tracklist.java refactor