Tidying up of styling