[mod] small cleanups