Cleaned and optimized World code