Tiny superficial cleanups