[fix] minor cleanups