Minor Code Cleanup