Refactoring

Refactored the way places were handled
Illustrations