Cleaned up world Draw