Changes based on review comments.
Finished feature 47719543/amo-review.