World Map II Clean up

Cleaned up the code for World Map II