Refactored drawing code: it's part of the World class now.