woops, this is much faster
small cleanup