Some minor tidying throughout modules