cleanup, use Array<> syntax