minor comments
minor tidying
code clean up