Style tidying up