[refactor][s]: more minor cleanup.