All changes from Blake's feedback done