Minor Code Cleanups