Minor Cleanups