cleanup and unify callsites