Updating: minorly tidying-up
Updating: tidying-up + minor fixing