nit: we should clean up this section and unify use of ' instead of "