AD review by Lars

[jdreed]

Sorry, I missed this yesterday. I agree with the suggestions and changes made here, LGTM.