Tidy up and initial documentatio