tidying up and styling change