change style and more tidying up