Add missed s interpolator, as pointed out by @xuwei-k
drop unused mutable data type generator