more tidying - code operational