Lint cleanups