Minor Code Cleanup Summary