Apply suggestions from code review
Apply suggestions from code review

Co-Authored-By: Eloy Durán <824a8b3b53f622742eb0570ebe0b80cc73431e09@gmail.com>

artsy/metaphysics,mzikherman/metaphysics-1,artsy/metaphysics,mzikherman/metaphysics-1,mzikherman/metaphysics-1,mzikherman/metaphysics-1,artsy/metaphysics