last round of style edits from @jorisvanzundert