some cleaning
service model ready for faceted