chore: minor cleanups