cleaned up inserter