Reading tcx simplified and cleaned-up.