Some Code Cleanup.