tidying and tweaking