and more POI and tidy code