remove that nested conditional