Did some minor tidying up of the directives