Zoher

Refactored code a bit and made it save less images.