some tidying
more tidying - code operational