tidying up first 2 sections