Refacto saliency map

7 jobs for development/small-fixes-hierarchies in 16 minutes and 26 seconds (queued for 6 seconds)