Cleanup to match
Updated following text
More cleanup