Cleaned up via `promise.spread()`

Thanks to @petebacondarwin for the tip.