refactoring for cleanliness

and because insert takes 2 args, not 3