code tidying and rationalisation.