Cleaned up code fog of war.