Refactoring

Splitting the __call__ in multiple functions makes easier to customize the product (e.g. adding markers, targets, and so on...)