tidying up the markup