Some tidying up for styles