commenting+cleanup ghp3