lint+cleanups