style tidying up