Remove nested conditional