minor: cleanups