Did some minor tidying up of Marathon and related code