Updating: minorly tidying up a bit.