Prefer composition to inheritance

minor tidying...