Cartoon. A bit of refactoring