code tidy up
further code tidy up