removed indicator functions from feature generator and now return a simpler object