improved images
Encapsulating responsibilites.