Revisions for @cohitre's feedback