Address some of @jvazquez-r7's spec feedback