Tidying up and adding extra comments