Minor Code Cleanup.