+ Refactored thumbnail generation