lint cleanups