tidy up
more code