Tidying up code, comments etc. and making final changes
Continuing to tidy up code, comments etc. and making final changes