Slightly improved track lookup and better codestyle.