Slight tidying of CFN script