Review fixes --- AP style