Small Cleanups