Smaller cleanups