Got rid of silly uses of apply and flatten