Small refactoring

World now is static, but WorldSound still singleton