cleaning, removed interpolations