More Code Cleanup