Nitpick cleanups!