tidy up
more fettling