[refactor] miscellaneous changes.