tidying and commenting changes.