just few things to tidy up